@hintergrund/worker 0.2.3 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (113) hide show
  1. package/dist/api/cms/handlers/admin-users.handler.d.ts +1 -0
  2. package/dist/api/cms/handlers/admin-users.handler.d.ts.map +1 -1
  3. package/dist/api/cms/handlers/admin-users.handler.js +60 -79
  4. package/dist/api/cms/handlers/auth.handler.d.ts +1 -1
  5. package/dist/api/cms/handlers/auth.handler.d.ts.map +1 -1
  6. package/dist/api/cms/handlers/auth.handler.js +13 -94
  7. package/dist/api/cms/handlers/dashboard.handler.d.ts +1 -1
  8. package/dist/api/cms/handlers/dashboard.handler.d.ts.map +1 -1
  9. package/dist/api/cms/handlers/dashboard.handler.js +1 -1
  10. package/dist/api/cms/handlers/github-secrets.handler.d.ts.map +1 -1
  11. package/dist/api/cms/handlers/github-secrets.handler.js +8 -1
  12. package/dist/api/cms/handlers/integrations.handler.d.ts +5 -0
  13. package/dist/api/cms/handlers/integrations.handler.d.ts.map +1 -0
  14. package/dist/api/cms/handlers/integrations.handler.js +24 -0
  15. package/dist/api/cms/handlers/recovery.handler.d.ts +5 -0
  16. package/dist/api/cms/handlers/recovery.handler.d.ts.map +1 -0
  17. package/dist/api/cms/handlers/recovery.handler.js +53 -0
  18. package/dist/api/cms/handlers/setup.handler.d.ts.map +1 -1
  19. package/dist/api/cms/handlers/setup.handler.js +142 -36
  20. package/dist/api/cms/handlers/website-repo.handler.d.ts +2 -0
  21. package/dist/api/cms/handlers/website-repo.handler.d.ts.map +1 -1
  22. package/dist/api/cms/handlers/website-repo.handler.js +124 -16
  23. package/dist/api/cms/handlers/website-templates.handler.d.ts +2 -0
  24. package/dist/api/cms/handlers/website-templates.handler.d.ts.map +1 -1
  25. package/dist/api/cms/handlers/website-templates.handler.js +22 -2
  26. package/dist/api/cms/routes/auth.routes.d.ts +1 -1
  27. package/dist/api/cms/routes/auth.routes.d.ts.map +1 -1
  28. package/dist/api/cms/routes/auth.routes.js +7 -2
  29. package/dist/api/cms/routes/index.d.ts +1 -1
  30. package/dist/api/cms/routes/index.d.ts.map +1 -1
  31. package/dist/api/cms/routes/index.js +11 -8
  32. package/dist/api/emails/handlers/campaigns.handler.d.ts.map +1 -1
  33. package/dist/api/emails/handlers/campaigns.handler.js +3 -4
  34. package/dist/api/emails/handlers/invoice.handler.d.ts +8 -15
  35. package/dist/api/emails/handlers/invoice.handler.d.ts.map +1 -1
  36. package/dist/api/emails/handlers/invoice.handler.js +142 -170
  37. package/dist/api/emails/handlers/public.handler.d.ts.map +1 -1
  38. package/dist/api/emails/handlers/public.handler.js +27 -8
  39. package/dist/api/emails/handlers/send.handler.d.ts +1 -3
  40. package/dist/api/emails/handlers/send.handler.d.ts.map +1 -1
  41. package/dist/api/emails/handlers/send.handler.js +18 -65
  42. package/dist/api/emails/handlers/settings.handler.d.ts +60 -12
  43. package/dist/api/emails/handlers/settings.handler.d.ts.map +1 -1
  44. package/dist/api/emails/handlers/settings.handler.js +38 -94
  45. package/dist/api/emails/routes/admin.routes.d.ts.map +1 -1
  46. package/dist/api/emails/routes/admin.routes.js +5 -6
  47. package/dist/api/emails/routes/mail-events.routes.d.ts +5 -0
  48. package/dist/api/emails/routes/mail-events.routes.d.ts.map +1 -0
  49. package/dist/api/emails/routes/mail-events.routes.js +29 -0
  50. package/dist/api/emails/routes/mail.routes.d.ts +5 -0
  51. package/dist/api/emails/routes/mail.routes.d.ts.map +1 -0
  52. package/dist/api/emails/routes/mail.routes.js +188 -0
  53. package/dist/api/shop/handlers/products.handler.d.ts +2 -2
  54. package/dist/api/shop/handlers/products.handler.d.ts.map +1 -1
  55. package/dist/api/shop/handlers/products.handler.js +30 -8
  56. package/dist/api/shop/handlers/public.handler.d.ts.map +1 -1
  57. package/dist/api/shop/handlers/public.handler.js +17 -66
  58. package/dist/index.d.ts +10 -1
  59. package/dist/index.d.ts.map +1 -1
  60. package/dist/index.js +26 -18
  61. package/dist/lib/brand.d.ts +6 -0
  62. package/dist/lib/brand.d.ts.map +1 -0
  63. package/dist/lib/brand.js +29 -0
  64. package/dist/lib/config.d.ts.map +1 -1
  65. package/dist/lib/config.js +1 -4
  66. package/dist/lib/email-template.d.ts +2 -5
  67. package/dist/lib/email-template.d.ts.map +1 -1
  68. package/dist/lib/email-template.js +6 -27
  69. package/dist/lib/email.d.ts +20 -11
  70. package/dist/lib/email.d.ts.map +1 -1
  71. package/dist/lib/email.js +29 -19
  72. package/dist/lib/github.d.ts +1 -1
  73. package/dist/lib/github.d.ts.map +1 -1
  74. package/dist/lib/github.js +13 -4
  75. package/dist/lib/integration-health.d.ts +18 -0
  76. package/dist/lib/integration-health.d.ts.map +1 -0
  77. package/dist/lib/integration-health.js +51 -0
  78. package/dist/lib/invoice.d.ts +13 -0
  79. package/dist/lib/invoice.d.ts.map +1 -0
  80. package/dist/lib/invoice.js +41 -0
  81. package/dist/lib/launch-draft.d.ts +14 -0
  82. package/dist/lib/launch-draft.d.ts.map +1 -0
  83. package/dist/lib/launch-draft.js +45 -0
  84. package/dist/lib/launch.d.ts +3 -0
  85. package/dist/lib/launch.d.ts.map +1 -0
  86. package/dist/lib/launch.js +18 -0
  87. package/dist/lib/mail-schema.d.ts +5 -0
  88. package/dist/lib/mail-schema.d.ts.map +1 -0
  89. package/dist/lib/mail-schema.js +62 -0
  90. package/dist/lib/mail.d.ts +83 -0
  91. package/dist/lib/mail.d.ts.map +1 -0
  92. package/dist/lib/mail.js +211 -0
  93. package/dist/lib/project-db.d.ts +3 -4
  94. package/dist/lib/project-db.d.ts.map +1 -1
  95. package/dist/lib/project-db.js +27 -42
  96. package/dist/lib/template-installer.d.ts +9 -0
  97. package/dist/lib/template-installer.d.ts.map +1 -0
  98. package/dist/lib/template-installer.js +97 -0
  99. package/dist/lib/template.d.ts.map +1 -1
  100. package/dist/lib/template.js +28 -0
  101. package/dist/lib/user-recovery.d.ts +9 -0
  102. package/dist/lib/user-recovery.d.ts.map +1 -0
  103. package/dist/lib/user-recovery.js +42 -0
  104. package/dist/lib/website-i18n.d.ts +10 -0
  105. package/dist/lib/website-i18n.d.ts.map +1 -0
  106. package/dist/lib/website-i18n.js +195 -0
  107. package/dist/middleware/auth.d.ts +3 -1
  108. package/dist/middleware/auth.d.ts.map +1 -1
  109. package/dist/middleware/auth.js +8 -4
  110. package/package.json +4 -2
  111. package/dist/hintergrund-assets.d.ts +0 -5
  112. package/dist/hintergrund-assets.d.ts.map +0 -1
  113. package/dist/hintergrund-assets.js +0 -11
@@ -2,6 +2,7 @@ import type { Context } from 'hono';
2
2
  import type { HonoEnv } from '../../../index';
3
3
  export declare function listAdminUsers(c: Context<HonoEnv>): Promise<Response>;
4
4
  export declare function createAdminUser(c: Context<HonoEnv>): Promise<Response>;
5
+ export declare function sendUserRecovery(c: Context<HonoEnv>): Promise<Response>;
5
6
  export declare function patchAdminUser(c: Context<HonoEnv>): Promise<Response>;
6
7
  export declare function deleteAdminUser(c: Context<HonoEnv>): Promise<Response>;
7
8
  //# sourceMappingURL=admin-users.handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"admin-users.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/admin-users.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAwB9C,wBAAsB,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAU3E;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE5E;AA8BD,wBAAsB,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqC3E;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiB5E"}
1
+ {"version":3,"file":"admin-users.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/admin-users.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAS9C,wBAAsB,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAI3E;AACD,wBAAsB,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAmB5E;AACD,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAM7E;AACD,wBAAsB,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAgB3E;AACD,wBAAsB,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAS5E"}
@@ -1,101 +1,82 @@
1
- import { hashPw } from '../../../lib/auth/crypto';
2
1
  import { createId, ensureSchema, nowSeconds } from '../../../lib/project-db';
3
- const LOGIN_METHODS = ['password', 'otp'];
4
- function userToResponse(user) {
5
- return {
6
- id: user.id,
7
- email: user.email,
8
- name: user.name,
9
- loginMethod: user.login_method,
10
- disabledAt: user.disabled_at,
11
- createdAt: user.created_at,
12
- updatedAt: user.updated_at,
13
- hasPassword: !!user.password_hash,
14
- };
2
+ import { sendRecovery, validEmail } from '../../../lib/user-recovery';
3
+ function userToResponse(user, currentId) {
4
+ return { id: user.id, email: user.email, name: user.name, disabledAt: user.disabled_at,
5
+ createdAt: user.created_at, updatedAt: user.updated_at, hasPassword: !!user.password_hash,
6
+ isFirst: user.initial_admin === 1, isCurrent: user.id === currentId };
15
7
  }
16
8
  export async function listAdminUsers(c) {
17
9
  const db = await ensureSchema(c.env);
18
- const { results } = await db
19
- .prepare('SELECT * FROM admin_users ORDER BY created_at ASC, id ASC')
20
- .all();
21
- const users = (results ?? []).map((user, index) => ({
22
- ...userToResponse(user),
23
- isFirst: index === 0,
24
- }));
25
- return c.json({ users });
10
+ const { results } = await db.prepare('SELECT * FROM admin_users ORDER BY created_at ASC, id ASC').all();
11
+ return c.json({ users: results.map(user => userToResponse(user, c.get('user')?.userId)) });
26
12
  }
27
13
  export async function createAdminUser(c) {
28
- return createAdminUserFromBody(c, await c.req.json(), 201);
29
- }
30
- async function createAdminUserFromBody(c, body, status) {
31
- const email = String(body.email ?? '').toLowerCase().trim();
32
- const name = body.name ? String(body.name).trim() : null;
33
- const loginMethod = LOGIN_METHODS.includes(body.loginMethod) ? body.loginMethod : 'otp';
34
- if (!email) {
35
- return c.json({ error: 'Email is required' }, 400);
36
- }
37
- if (loginMethod === 'password' && !body.passwordHash && !body.password) {
38
- return c.json({ error: 'password is required for password users' }, 400);
39
- }
14
+ const body = await c.req.json();
15
+ const email = typeof body.email === 'string' ? body.email.toLowerCase().trim() : '';
16
+ const name = typeof body.name === 'string' ? body.name.trim().slice(0, 200) : null;
17
+ if (!validEmail(email))
18
+ return c.json({ error: 'A valid primary email address is required.' }, 400);
40
19
  const db = await ensureSchema(c.env);
41
20
  const now = nowSeconds();
42
21
  const id = createId('user');
43
- const passwordHash = body.password ? await hashPw(String(body.password), c.env.SECRET ?? '') : body.passwordHash ?? null;
44
- await db
45
- .prepare(`INSERT INTO admin_users (id, email, name, password_hash, login_method, disabled_at, created_at, updated_at)
46
- VALUES (?, ?, ?, ?, ?, NULL, ?, ?)`)
47
- .bind(id, email, name, passwordHash, loginMethod, now, now)
48
- .run();
49
- const user = await db.prepare('SELECT * FROM admin_users WHERE id = ?').bind(id).first();
50
- return c.json({ user: userToResponse(user) }, status);
22
+ const result = await db.prepare(`INSERT INTO admin_users (id, email, name, password_hash, login_method, created_at, updated_at)
23
+ VALUES (?, ?, ?, NULL, 'password', ?, ?) ON CONFLICT(email) DO NOTHING`).bind(id, email, name, now, now).run();
24
+ if (!result.meta.changes)
25
+ return c.json({ error: 'A user with this email already exists.' }, 409);
26
+ const user = (await db.prepare('SELECT * FROM admin_users WHERE id = ?').bind(id).first());
27
+ try {
28
+ await sendRecovery(c.env, user, new URL(c.req.url).origin);
29
+ return c.json({ user: userToResponse(user), message: 'User created. Password setup email sent.' }, 201);
30
+ }
31
+ catch (error) {
32
+ // Keep a visible pending account so the administrator can resend, not create duplicates.
33
+ return c.json({ user: userToResponse(user), message: 'User created, but the invitation could not be sent. Fix email settings and resend the invitation.', invitationSent: false }, 201);
34
+ }
35
+ }
36
+ export async function sendUserRecovery(c) {
37
+ const db = await ensureSchema(c.env);
38
+ const user = await db.prepare('SELECT * FROM admin_users WHERE id = ? AND disabled_at IS NULL').bind(c.req.param('id')).first();
39
+ if (!user)
40
+ return c.json({ error: 'Active user not found.' }, 404);
41
+ try {
42
+ await sendRecovery(c.env, user, new URL(c.req.url).origin);
43
+ return c.json({ success: true, message: 'Password setup email sent to the primary email address.' });
44
+ }
45
+ catch (error) {
46
+ return c.json({ error: error instanceof Error ? error.message : 'Unable to send email.' }, 400);
47
+ }
51
48
  }
52
49
  export async function patchAdminUser(c) {
53
50
  const userId = c.req.param('id');
54
- if (!userId)
55
- return c.json({ error: 'Missing user id' }, 400);
56
51
  const body = await c.req.json();
52
+ if (body.email !== undefined || body.password !== undefined || body.passwordHash !== undefined)
53
+ return c.json({ error: 'Credentials can only be set through a link sent to the primary email. Create a new user to change the primary address.' }, 400);
54
+ if (body.disabled !== undefined && typeof body.disabled !== 'boolean')
55
+ return c.json({ error: 'Invalid disabled state.' }, 400);
57
56
  const db = await ensureSchema(c.env);
58
57
  const existing = await db.prepare('SELECT * FROM admin_users WHERE id = ?').bind(userId).first();
59
- if (!existing) {
60
- return c.json({ error: 'User not found' }, 404);
61
- }
62
- const email = body.email === undefined ? existing.email : String(body.email).toLowerCase().trim();
63
- const name = body.name === undefined ? existing.name : (body.name ? String(body.name).trim() : null);
64
- const loginMethod = body.loginMethod === undefined || !LOGIN_METHODS.includes(body.loginMethod)
65
- ? existing.login_method
66
- : body.loginMethod;
67
- const disabledAt = body.disabled === undefined ? existing.disabled_at : (body.disabled ? nowSeconds() : null);
68
- const passwordHash = body.password
69
- ? await hashPw(String(body.password), c.env.SECRET ?? '')
70
- : (body.passwordHash === undefined ? existing.password_hash : body.passwordHash);
71
- // The owner's password is the way back in when email delivery fails, so it can be
72
- // changed but never removed.
73
- if (existing.initial_admin === 1 && !passwordHash) {
74
- return c.json({ error: 'The site owner must keep a password.' }, 400);
75
- }
76
- const now = nowSeconds();
77
- await db
78
- .prepare(`UPDATE admin_users
79
- SET email = ?, name = ?, password_hash = ?, login_method = ?, disabled_at = ?, updated_at = ?
80
- WHERE id = ?`)
81
- .bind(email, name, passwordHash, loginMethod, disabledAt, now, userId)
82
- .run();
83
- const user = await db.prepare('SELECT * FROM admin_users WHERE id = ?').bind(userId).first();
84
- return c.json({ user: userToResponse(user) });
58
+ if (!existing)
59
+ return c.json({ error: 'User not found.' }, 404);
60
+ if (body.disabled && (existing.initial_admin === 1 || userId === c.get('user')?.userId))
61
+ return c.json({ error: 'You cannot disable yourself or the original owner.' }, 400);
62
+ const name = typeof body.name === 'string' ? body.name.trim().slice(0, 200) : existing.name;
63
+ const disabled = body.disabled === undefined ? existing.disabled_at : body.disabled ? nowSeconds() : null;
64
+ await db.batch([
65
+ db.prepare('UPDATE admin_users SET name = ?, disabled_at = ?, updated_at = ? WHERE id = ?').bind(name, disabled, Math.max(nowSeconds(), existing.updated_at + 1), userId),
66
+ db.prepare('DELETE FROM user_recovery WHERE user_id = ?').bind(userId),
67
+ ]);
68
+ return c.json({ success: true });
85
69
  }
86
70
  export async function deleteAdminUser(c) {
87
- const currentUser = c.get('user');
88
71
  const userId = c.req.param('id');
89
- if (currentUser?.userId === userId) {
90
- return c.json({ error: 'You cannot delete your own admin user' }, 400);
91
- }
72
+ if (c.get('user')?.userId === userId)
73
+ return c.json({ error: 'You cannot delete yourself.' }, 400);
92
74
  const db = await ensureSchema(c.env);
93
- const firstUser = await db
94
- .prepare('SELECT id FROM admin_users ORDER BY created_at ASC, id ASC LIMIT 1')
95
- .first();
96
- if (firstUser?.id === userId) {
97
- return c.json({ error: 'The original admin user cannot be deleted' }, 400);
98
- }
75
+ const existing = await db.prepare('SELECT * FROM admin_users WHERE id = ?').bind(userId).first();
76
+ if (!existing)
77
+ return c.json({ error: 'User not found.' }, 404);
78
+ if (existing.initial_admin === 1)
79
+ return c.json({ error: 'The original owner cannot be deleted.' }, 400);
99
80
  await db.prepare('DELETE FROM admin_users WHERE id = ?').bind(userId).run();
100
81
  return c.json({ success: true });
101
82
  }
@@ -1,5 +1,5 @@
1
1
  import { Context } from 'hono';
2
- import { HonoEnv } from '../../../index';
2
+ import type { HonoEnv } from '../../../index';
3
3
  export declare function login(c: Context<HonoEnv>): Promise<Response>;
4
4
  export declare function logout(c: Context<HonoEnv>): Promise<Response>;
5
5
  //# sourceMappingURL=auth.handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/auth.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAgBzC,wBAAsB,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqBlE;AAsHD,wBAAsB,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAOnE"}
1
+ {"version":3,"file":"auth.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/auth.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAY9C,wBAAsB,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAoBlE;AAeD,wBAAsB,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAOnE"}
@@ -1,118 +1,37 @@
1
1
  import { readRequestBody, verifyPw } from '../../../lib/auth/crypto';
2
2
  import { signWithPayload } from '../../../lib/auth/jwt';
3
3
  import { loadConfig } from '../../../lib/config';
4
- import { sendEmailOtp } from '../../../lib/email';
5
- import { createId, ensureSchema, getAdminUserByEmail, issueSessionForUser, nowSeconds, sha256Base64Url } from '../../../lib/project-db';
4
+ import { rateLimit } from '../../../lib/user-recovery';
5
+ import { getAdminUserByEmail, issueSessionForUser } from '../../../lib/project-db';
6
6
  export async function login(c) {
7
7
  try {
8
+ if (!await rateLimit(c.env, `login:${c.req.header('CF-Connecting-IP') || 'local'}`, 30, 900))
9
+ return loginError('Too many attempts. Try again later.', 429);
8
10
  const appConfig = loadConfig(c.env);
9
- const body = await readRequestBody(c.req.raw);
11
+ const body = (await readRequestBody(c.req.raw));
10
12
  const isSecure = c.req.url.startsWith('https://');
11
13
  const email = body.email?.toLowerCase().trim();
12
- if (!email)
13
- return loginError('Email is required', 400);
14
+ const password = body.password;
15
+ if (!email || !password)
16
+ return loginError('Email and password are required', 400);
14
17
  const user = await getAdminUserByEmail(c.env, email);
15
- if (!user)
18
+ if (!user || !user.password_hash)
19
+ return loginError('Invalid credentials', 401);
20
+ if (!(await verifyPw(user.password_hash, password, appConfig.global.hgSecret))) {
16
21
  return loginError('Invalid credentials', 401);
17
- // A stored password stays valid as a fallback: an OTP admin can still sign in when
18
- // email delivery breaks (expired provider key, changed DNS, provider outage).
19
- if (body.password)
20
- return await handleProjectPasswordLogin(c, body.password, appConfig.global.hgSecret, user, isSecure);
21
- if (user.login_method === 'password') {
22
- return c.json({ success: true, requirePassword: true });
23
22
  }
24
- return await handleProjectEmailOtpLogin(c, body.otp, user, appConfig, isSecure);
23
+ return signedInResponse(appConfig.global.hgSecret, user, isSecure);
25
24
  }
26
25
  catch (error) {
27
26
  console.error('Login error:', error);
28
27
  return loginError('Unable to sign in. Try again.', 401);
29
28
  }
30
29
  }
31
- /** The project owner keeps a password fallback; other admins do not. */
32
- function ownerHasPasswordFallback(user) {
33
- return user.initial_admin === 1 && !!user.password_hash;
34
- }
35
30
  function loginError(message, status) {
36
31
  return new Response(JSON.stringify({ success: false, message }), { status });
37
32
  }
38
- async function handleProjectPasswordLogin(c, password, hgSecret, user, isSecure) {
39
- // The owner always keeps their password as a fallback, so a broken email provider
40
- // cannot lock the project out. Other admins use only their chosen method, so a
41
- // forgotten password never lingers as a live credential.
42
- const ownerFallback = user.initial_admin === 1 && !!user.password_hash;
43
- if (!ownerFallback && user.login_method !== 'password') {
44
- return loginError('Password sign-in is not enabled for this user', 400);
45
- }
46
- if (!user.password_hash)
47
- return loginError('Password sign-in is not enabled for this user', 400);
48
- if (!(await verifyPw(user.password_hash, password, hgSecret)))
49
- return loginError('Invalid credentials', 401);
50
- return signedInResponse(hgSecret, user, isSecure);
51
- }
52
- async function handleProjectEmailOtpLogin(c, otp, user, appConfig, isSecure) {
53
- if (user.login_method !== 'otp')
54
- return loginError('Email-code sign-in is not enabled for this user', 400);
55
- const emailsConfig = appConfig.emails;
56
- if (!emailsConfig?.emailApiKey) {
57
- return c.json({
58
- success: false,
59
- requirePassword: ownerHasPasswordFallback(user),
60
- message: ownerHasPasswordFallback(user)
61
- ? 'Email codes are unavailable for this project. Sign in with your password instead.'
62
- : 'Email codes are unavailable because no email provider is configured for this project.',
63
- }, 503);
64
- }
65
- const db = await ensureSchema(c.env);
66
- const now = nowSeconds();
67
- const submittedOtp = otp?.trim();
68
- if (submittedOtp) {
69
- if (!/^\d{6}$/.test(submittedOtp))
70
- return loginError('Enter the six-digit code from your email.', 400);
71
- const codeHash = await otpHash(user.id, submittedOtp, appConfig.global.hgSecret);
72
- const result = await db.prepare(`UPDATE admin_email_otps
73
- SET used_at = ?
74
- WHERE user_id = ? AND code_hash = ? AND used_at IS NULL AND expires_at > ?`).bind(now, user.id, codeHash, now).run();
75
- if (!result.meta.changes)
76
- return loginError('That code is invalid or has expired. Request a new one.', 401);
77
- return signedInResponse(appConfig.global.hgSecret, user, isSecure);
78
- }
79
- const code = emailOtp();
80
- const codeHash = await otpHash(user.id, code, appConfig.global.hgSecret);
81
- await db.batch([
82
- db.prepare('DELETE FROM admin_email_otps WHERE user_id = ?').bind(user.id),
83
- db.prepare(`INSERT INTO admin_email_otps (id, user_id, code_hash, expires_at, used_at, created_at)
84
- VALUES (?, ?, ?, ?, NULL, ?)`).bind(createId('otp'), user.id, codeHash, now + 15 * 60, now),
85
- ]);
86
- const { settings } = await import('../../emails/handlers/settings.handler').then(({ readEmailSettings }) => readEmailSettings(c.env));
87
- try {
88
- await sendEmailOtp({
89
- to: user.email,
90
- apiKey: emailsConfig.emailApiKey,
91
- fromEmail: settings.fromEmail ?? '',
92
- fromName: settings.fromName,
93
- code,
94
- });
95
- }
96
- catch (error) {
97
- console.error('Sign-in code delivery failed:', error);
98
- return c.json({
99
- success: false,
100
- requirePassword: ownerHasPasswordFallback(user),
101
- message: ownerHasPasswordFallback(user)
102
- ? 'We could not send your sign-in code. Sign in with your password instead, then check the email provider settings.'
103
- : 'We could not send your sign-in code. Ask the site owner to check the email provider settings.',
104
- }, 503);
105
- }
106
- return c.json({ success: true, otpRequired: true, message: 'Check your email for a six-digit sign-in code.' });
107
- }
108
- function emailOtp() {
109
- return crypto.getRandomValues(new Uint32Array(1))[0].toString().slice(-6).padStart(6, '0');
110
- }
111
- async function otpHash(userId, code, secret) {
112
- return sha256Base64Url(`${userId}.${code}.${secret}`);
113
- }
114
33
  async function signedInResponse(secret, user, isSecure) {
115
- const token = await signWithPayload(secret, issueSessionForUser(user));
34
+ const token = await signWithPayload(secret, await issueSessionForUser(user));
116
35
  const secureCookie = isSecure ? '; Secure' : '';
117
36
  return new Response(JSON.stringify({ success: true }), {
118
37
  status: 200,
@@ -1,5 +1,5 @@
1
1
  import { Context } from 'hono';
2
- import { Bindings } from '../../..';
2
+ import type { Bindings } from '../../..';
3
3
  export declare function getDashboard(c: Context<{
4
4
  Bindings: Bindings;
5
5
  }>): Promise<Response>;
@@ -1 +1 @@
1
- {"version":3,"file":"dashboard.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/dashboard.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,wBAAsB,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAWxF"}
1
+ {"version":3,"file":"dashboard.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/dashboard.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGzC,wBAAsB,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAWxF"}
@@ -8,7 +8,7 @@ export async function getDashboard(c) {
8
8
  }
9
9
  catch (error) {
10
10
  // Fallback to default config if parsing fails
11
- const configParams = 'config=\'{"loginMethod":"password"}\'';
11
+ const configParams = 'config=\'{}\'';
12
12
  return c.html(getTemplate('admin', c.env.UI_BASE_URL, configParams));
13
13
  }
14
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"github-secrets.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/github-secrets.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA4C9C,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAI9E;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAkB/E;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAe/E;AAED,YAAY,EAAE,YAAY,EAAE,CAAC"}
1
+ {"version":3,"file":"github-secrets.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/github-secrets.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA6C9C,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAI9E;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuB/E;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAe/E;AAED,YAAY,EAAE,YAAY,EAAE,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import { getGitHubConfig } from '../../../lib/config';
2
2
  import { createGitHubClient } from '../../../lib/github';
3
+ import { checkIntegrationKey, INTEGRATION_SECRETS } from '../../../lib/integration-health';
3
4
  const SECRET_NAME = /^[A-Z_][A-Z0-9_]*$/;
4
5
  const MAX_SECRET_BYTES = 64 * 1024;
5
6
  // These are the only Actions secrets consumed by the generated deployment
@@ -57,8 +58,14 @@ export async function upsertGitHubSecret(c) {
57
58
  if (new TextEncoder().encode(body.value).byteLength > MAX_SECRET_BYTES) {
58
59
  return c.json({ error: 'Secret value exceeds GitHub’s 64 KB limit.' }, 400);
59
60
  }
61
+ const provider = Object.keys(INTEGRATION_SECRETS).find(provider => INTEGRATION_SECRETS[provider] === name);
62
+ if (provider) {
63
+ const health = await checkIntegrationKey(provider, body.value);
64
+ if (!health.valid)
65
+ return c.json({ error: health.message }, 400);
66
+ }
60
67
  const client = createGitHubClient(getGitHubConfig(c.env));
61
- await client.setActionsSecret(name, body.value);
68
+ await client.setActionsSecret(name, provider ? body.value.trim() : body.value);
62
69
  const deploy = body.deploy !== false;
63
70
  const deploymentStarted = deploy ? await dispatchDeploy(c) : false;
64
71
  return c.json({ success: true, deploymentStarted });
@@ -0,0 +1,5 @@
1
+ import type { Context } from 'hono';
2
+ import type { HonoEnv } from '../../../index';
3
+ export declare const testSetupIntegration: (c: Context<HonoEnv>) => Promise<Response>;
4
+ export declare const testIntegration: (c: Context<HonoEnv>) => Promise<Response>;
5
+ //# sourceMappingURL=integrations.handler.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"integrations.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/integrations.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAoB9C,eAAO,MAAM,oBAAoB,GAAI,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAmB,CAAC;AAC5E,eAAO,MAAM,eAAe,GAAI,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAoB,CAAC"}
@@ -0,0 +1,24 @@
1
+ import { checkIntegrationKey, INTEGRATION_SECRETS, isIntegrationProvider } from '../../../lib/integration-health';
2
+ import { hasValidSetupToken, projectNeedsSetup } from './setup.handler';
3
+ async function check(c, setup) {
4
+ c.header('Cache-Control', 'no-store');
5
+ const origin = c.req.header('origin');
6
+ if (origin && origin !== new URL(c.req.url).origin)
7
+ return c.json({ error: 'Invalid origin.' }, 403);
8
+ const body = await c.req.json().catch(() => null);
9
+ if (!body)
10
+ return c.json({ error: 'Invalid request.' }, 400);
11
+ if (setup && (!(await hasValidSetupToken(c.env, body.setupToken)) || !(await projectNeedsSetup(c)))) {
12
+ return c.json({ error: 'Invalid or expired setup link.' }, 403);
13
+ }
14
+ const provider = c.req.param('provider') ?? '';
15
+ if (!isIntegrationProvider(provider))
16
+ return c.json({ error: 'Unsupported integration.' }, 400);
17
+ if (body.key !== undefined && typeof body.key !== 'string')
18
+ return c.json({ error: 'Invalid key.' }, 400);
19
+ const stored = provider === 'plunk' ? c.env.API_KEY || c.env.PLUNK_SECRET_KEY : c.env[INTEGRATION_SECRETS[provider]];
20
+ const key = typeof body.key === 'string' ? body.key : setup ? '' : stored ?? '';
21
+ return c.json(await checkIntegrationKey(provider, key));
22
+ }
23
+ export const testSetupIntegration = (c) => check(c, true);
24
+ export const testIntegration = (c) => check(c, false);
@@ -0,0 +1,5 @@
1
+ import type { Context } from 'hono';
2
+ import type { HonoEnv } from '../../../index';
3
+ export declare function requestPasswordReset(c: Context<HonoEnv>): Promise<Response>;
4
+ export declare function completePasswordReset(c: Context<HonoEnv>): Promise<Response>;
5
+ //# sourceMappingURL=recovery.handler.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"recovery.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/recovery.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAK9C,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAcjF;AAED,wBAAsB,qBAAqB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAoBlF"}
@@ -0,0 +1,53 @@
1
+ import { ensureSchema, nowSeconds, sha256Base64Url } from '../../../lib/project-db';
2
+ import { hashPw } from '../../../lib/auth/crypto';
3
+ import { rateLimit, sendRecovery, validEmail, validPassword } from '../../../lib/user-recovery';
4
+ export async function requestPasswordReset(c) {
5
+ const generic = { success: true, message: 'If an active account exists, a password setup link will be sent to its primary email address.' };
6
+ const body = await c.req.json();
7
+ const email = typeof body.email === 'string' ? body.email.trim().toLowerCase() : '';
8
+ if (!validEmail(email))
9
+ return c.json(generic);
10
+ const ip = c.req.header('CF-Connecting-IP') || 'local';
11
+ if (!await rateLimit(c.env, `recovery-ip:${ip}`, 10, 3600))
12
+ return c.json(generic);
13
+ // Identical response and asynchronous delivery avoid exposing account existence/provider failures.
14
+ c.executionCtx.waitUntil((async () => {
15
+ const db = await ensureSchema(c.env);
16
+ const user = await db.prepare('SELECT * FROM admin_users WHERE email = ? AND disabled_at IS NULL').bind(email).first();
17
+ if (user) {
18
+ try {
19
+ await sendRecovery(c.env, user, new URL(c.req.url).origin);
20
+ }
21
+ catch {
22
+ console.warn('Account recovery delivery unavailable');
23
+ }
24
+ }
25
+ })());
26
+ return c.json(generic);
27
+ }
28
+ export async function completePasswordReset(c) {
29
+ const body = await c.req.json();
30
+ if (typeof body.token !== 'string' || !/^[a-f0-9]{64}$/.test(body.token))
31
+ return c.json({ error: 'Invalid or expired link.' }, 400);
32
+ if (!validPassword(body.password))
33
+ return c.json({ error: 'Use a password between 12 and 256 characters.' }, 400);
34
+ if (!await rateLimit(c.env, `reset-ip:${c.req.header('CF-Connecting-IP') || 'local'}`, 20, 3600))
35
+ return c.json({ error: 'Too many attempts. Try again later.' }, 429);
36
+ if (!c.env.SECRET)
37
+ return c.json({ error: 'Server configuration error.' }, 503);
38
+ const db = await ensureSchema(c.env);
39
+ const digest = await sha256Base64Url(body.token);
40
+ const now = nowSeconds();
41
+ const passwordHash = await hashPw(body.password, c.env.SECRET);
42
+ // Batch is transactional: token consumption and credential update cannot race or partially commit.
43
+ const results = await db.batch([
44
+ db.prepare(`UPDATE admin_users SET password_hash = ?, updated_at = ? WHERE disabled_at IS NULL AND id IN
45
+ (SELECT user_id FROM user_recovery WHERE token_hash = ? AND expires_at > ?)`)
46
+ .bind(passwordHash, now, digest, now),
47
+ db.prepare('DELETE FROM user_recovery WHERE token_hash = ?').bind(digest),
48
+ ]);
49
+ if (!results[0].meta.changes)
50
+ return c.json({ error: 'Invalid or expired link.' }, 400);
51
+ c.header('Set-Cookie', `token=; HttpOnly; Path=/; SameSite=Strict; Max-Age=0${new URL(c.req.url).protocol === 'https:' ? '; Secure' : ''}`);
52
+ return c.json({ success: true, message: 'Password saved. Sign in with your primary email address.' });
53
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"setup.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/setup.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAUpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAwB9C,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAQtG;AAQD,uFAAuF;AACvF,wBAAsB,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAIzE;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA+IzE;AAED,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAE7E"}
1
+ {"version":3,"file":"setup.handler.d.ts","sourceRoot":"","sources":["../../../../src/api/cms/handlers/setup.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAYpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAwB9C,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAQtG;AAQD,uFAAuF;AACvF,wBAAsB,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAUzE;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6NzE;AAED,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAE7E"}